Include gtkalias.h in the generated sources gtkmarhalers.c and

2004-08-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/Makefile.am: Include gtkalias.h in the generated
	sources gtkmarhalers.c and gtkmarshal.c.

	* gtk/makegtkalias.pl: Cosmetic fix.

	* gdk/Makefile.am: Remove the . which was accidentally added
	to SUBDIRS. Include gdkalias.h in the generated sources
	gdkenumtypes.c and gdkmarshalers.c.

	* gdk/makegdkalias.pl: Cosmetic fix.

	* gdk/Makefile.am: Add gdkalias.h to BUILT_SOURCES.

diff --git a/ChangeLog b/ChangeLog
index 5063c313ac7b2cdad49b3f90a08bf6ece44a31ad..a7662ca05402fad140cf01093a1585c27391d006 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/Makefile.am: Include gtkalias.h in the generated
+       sources gtkmarhalers.c and gtkmarshal.c.
+
+       * gtk/makegtkalias.pl: Cosmetic fix.
+
+       * gdk/Makefile.am: Remove the . which was accidentally added
+       to SUBDIRS. Include gdkalias.h in the generated sources 
+       gdkenumtypes.c and gdkmarshalers.c.
+
+       * gdk/makegdkalias.pl: Cosmetic fix.
+
        * gdk/Makefile.am: Add gdkalias.h to BUILT_SOURCES.
 
 2004-08-09  Hans Breuer  <hans@breuer.org>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5063c313ac7b2cdad49b3f90a08bf6ece44a31ad..a7662ca05402fad140cf01093a1585c27391d006 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,16 @@
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/Makefile.am: Include gtkalias.h in the generated
+       sources gtkmarhalers.c and gtkmarshal.c.
+
+       * gtk/makegtkalias.pl: Cosmetic fix.
+
+       * gdk/Makefile.am: Remove the . which was accidentally added
+       to SUBDIRS. Include gdkalias.h in the generated sources 
+       gdkenumtypes.c and gdkmarshalers.c.
+
+       * gdk/makegdkalias.pl: Cosmetic fix.
+
        * gdk/Makefile.am: Add gdkalias.h to BUILT_SOURCES.
 
 2004-08-09  Hans Breuer  <hans@breuer.org>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5063c313ac7b2cdad49b3f90a08bf6ece44a31ad..a7662ca05402fad140cf01093a1585c27391d006 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,16 @@
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/Makefile.am: Include gtkalias.h in the generated
+       sources gtkmarhalers.c and gtkmarshal.c.
+
+       * gtk/makegtkalias.pl: Cosmetic fix.
+
+       * gdk/Makefile.am: Remove the . which was accidentally added
+       to SUBDIRS. Include gdkalias.h in the generated sources 
+       gdkenumtypes.c and gdkmarshalers.c.
+
+       * gdk/makegdkalias.pl: Cosmetic fix.
+
        * gdk/Makefile.am: Add gdkalias.h to BUILT_SOURCES.
 
 2004-08-09  Hans Breuer  <hans@breuer.org>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5063c313ac7b2cdad49b3f90a08bf6ece44a31ad..a7662ca05402fad140cf01093a1585c27391d006 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,16 @@
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/Makefile.am: Include gtkalias.h in the generated
+       sources gtkmarhalers.c and gtkmarshal.c.
+
+       * gtk/makegtkalias.pl: Cosmetic fix.
+
+       * gdk/Makefile.am: Remove the . which was accidentally added
+       to SUBDIRS. Include gdkalias.h in the generated sources 
+       gdkenumtypes.c and gdkmarshalers.c.
+
+       * gdk/makegdkalias.pl: Cosmetic fix.
+
        * gdk/Makefile.am: Add gdkalias.h to BUILT_SOURCES.
 
 2004-08-09  Hans Breuer  <hans@breuer.org>

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 3b23daf3781975449e7bd6b1571d77e14ef70cc6..f5bb2d86de55ba161063f8c5348c9c8bd51ec558 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for gtk+/gdk
 
-SUBDIRS = . $(gdktarget)
+SUBDIRS = $(gdktarget)
 DIST_SUBDIRS = linux-fb win32 x11
 
 EXTRA_DIST =                   \
@@ -235,7 +235,7 @@ stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
        && echo timestamp > $(@F)
 gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
        ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"" \
+                       --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdkalias.h\"\n#include \"gdk.h\"" \
                --fprod "\n/* enumerations from \"@filename@\" */" \
                        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
                        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
@@ -252,7 +252,7 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
        && mv gdkmarshalers-h.tmp gdkmarshalers.h \
        || ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp       \
+       (echo "#include \"gdkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp     \
        && mv gdkmarshalers-c.tmp gdkmarshalers.c \
        || ( rm -f gdkmarshalers-c.tmp && exit 1 )
 

diff --git a/gdk/makegdkalias.pl b/gdk/makegdkalias.pl
index c5fb8e4e9730f3a0277577d94a8d73060505d3fb..3f04a52a16afe5821529e34bb68b8cf597b81b9e 100755 (executable)
--- a/gdk/makegdkalias.pl
+++ b/gdk/makegdkalias.pl
@@ -59,14 +59,12 @@ EOF
 
 print $preamble;
 while (<>) {
-  my $str = $_;
-  chomp($str);
 
   # ignore empty lines
-  if ("$str" eq "") {
-      next;
-  }
+  next if /^\s*$/;
 
+  my $str = $_;
+  chomp($str);
   my $alias = $str."__internal_alias";
   
   print "extern __typeof ($str) $alias __attribute((visibility(\"hidden\"))); \n";

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 882e83b0ebdcde83b87076c7a2cbbf6bd7eb7f16..1a36c069b5cd03ac22a835790848721faf9a9de7 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -591,7 +591,7 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
        && rm -f xgen-gmlh \
        && echo timestamp > $(@F)       
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body >> xgen-gmlc \
+       (echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc
 
@@ -605,7 +605,7 @@ stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
        && rm -f xgen-gmh \
        && echo timestamp > $(@F)
 gtkmarshal.c: @REBUILD@ gtkmarshal.list
-       $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body >> xgen-gmc \
+       (echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body) >> xgen-gmc \
        && cp xgen-gmc gtkmarshal.c \
        && rm -f xgen-gmc 
 

diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
index d6cbd0deac75d851028e61d6a1618849a568ef7e..e057cad23618b9dc48131af26093046fb84cb83e 100755 (executable)
--- a/gtk/makegtkalias.pl
+++ b/gtk/makegtkalias.pl
@@ -71,14 +71,12 @@ EOF
 
 print $preamble;
 while (<>) {
-  my $str = $_;
-  chomp($str);
 
   # ignore empty lines
-  if ("$str" eq "") {
-      next;
-  }
+  next if /^\s*$/;
 
+  my $str = $_;
+  chomp($str);
   my $alias = $str."__internal_alias";
   
   print "extern __typeof ($str) $alias __attribute((visibility(\"hidden\"))); \n";